From 206fbf7a9e6bf9eec6663e322221667e43b7f8e9 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Thu, 20 Apr 2017 00:35:54 +0200
Subject: [PATCH] Update deps-adjust.patch

---
 debian/patches/deps-adjust.patch | 89 +++++++++-----------------------
 1 file changed, 23 insertions(+), 66 deletions(-)

diff --git a/debian/patches/deps-adjust.patch b/debian/patches/deps-adjust.patch
index 0c3da2d8c..7d06c30bc 100644
--- a/debian/patches/deps-adjust.patch
+++ b/debian/patches/deps-adjust.patch
@@ -3,13 +3,9 @@ Description: Adjust deps dependencies
  This is a workaround for bugs in the embedding script
 Forwarded: not-needed
 
-Index: cargo/deps/tar-0.4.8/Cargo.toml
-===================================================================
---- cargo.orig/deps/tar-0.4.8/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
-+++ cargo/deps/tar-0.4.8/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
-@@ -23,9 +23,3 @@
- 
- [dev-dependencies]
+--- a/deps/tar-0.4.9/Cargo.toml
++++ b/deps/tar-0.4.9/Cargo.toml
+@@ -25,7 +25 @@
  tempdir = "0.3"
 -
 -[target."cfg(unix)".dependencies]
@@ -17,90 +13,51 @@ Index: cargo/deps/tar-0.4.8/Cargo.toml
 -
 -[features]
 -default = ["xattr"]
-Index: cargo/deps/libgit2-sys-0.6.2/Cargo.toml
-===================================================================
---- cargo.orig/deps/libgit2-sys-0.6.2/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
-+++ cargo/deps/libgit2-sys-0.6.2/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
-@@ -18,15 +18,13 @@
- libc = "0.2"
- libssh2-sys = { version = "0.2", optional = true }
+--- a/deps/libgit2-sys-0.6.6/Cargo.toml
++++ b/deps/libgit2-sys-0.6.6/Cargo.toml
+@@ -20,2 +20,3 @@
  libz-sys = ">= 0"
 +openssl-sys = { version = "0.9", optional = true }
  
- [build-dependencies]
- pkg-config = "0.3"
- cmake = "0.1.2"
- gcc = "0.3"
+@@ -26,5 +27,2 @@
  
 -[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
 -openssl-sys = { version = "0.9", optional = true }
 -
  [features]
- ssh = ["libssh2-sys"]
- https = ["openssl-sys"]
-Index: cargo/deps/git2-0.6.0/Cargo.toml
-===================================================================
---- cargo.orig/deps/git2-0.6.0/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
-+++ cargo/deps/git2-0.6.0/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
-@@ -20,8 +20,6 @@
- bitflags = "0.7"
- libc = "0.2"
- libgit2-sys = { path = "libgit2-sys", version = "0.6.0" }
+--- a/deps/git2-0.6.3/Cargo.toml
++++ b/deps/git2-0.6.3/Cargo.toml
+@@ -22,4 +22,2 @@
+ libgit2-sys = { path = "libgit2-sys", version = "0.6.4" }
 -
 -[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
  openssl-sys = { version = "0.9.0", optional = true }
- openssl-probe = { version = "0.1", optional = true }
- 
-Index: cargo/deps/fs2-0.3.0/Cargo.toml
-===================================================================
---- cargo.orig/deps/fs2-0.3.0/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
-+++ cargo/deps/fs2-0.3.0/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
-@@ -8,7 +8,7 @@
- description = "Cross-platform file locks and file duplication."
- keywords = ["file", "file-system", "lock", "duplicate", "flock"]
+--- a/deps/fs2-0.3.0/Cargo.toml
++++ b/deps/fs2-0.3.0/Cargo.toml
+@@ -10,3 +10,3 @@
  
 -[target.'cfg(unix)'.dependencies]
 +[dependencies]
  libc = "0.2.2"
- 
- [target.'cfg(windows)'.dependencies]
-Index: cargo/deps/libssh2-sys-0.2.3/Cargo.toml
-===================================================================
---- cargo.orig/deps/libssh2-sys-0.2.3/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
-+++ cargo/deps/libssh2-sys-0.2.3/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
-@@ -15,8 +15,6 @@
- [dependencies]
- libz-sys = ">= 0"
+--- a/deps/libssh2-sys-0.2.5/Cargo.toml
++++ b/deps/libssh2-sys-0.2.5/Cargo.toml
+@@ -17,4 +17,2 @@
  libc = "0.2"
 -
 -[target."cfg(unix)".dependencies]
  openssl-sys = "0.9"
- 
- [build-dependencies]
-Index: cargo/deps/curl-sys-0.3.4/Cargo.toml
-===================================================================
---- cargo.orig/deps/curl-sys-0.3.4/Cargo.toml	2016-11-26 00:29:31.476349287 +0000
-+++ cargo/deps/curl-sys-0.3.4/Cargo.toml	2016-11-26 00:29:31.472349323 +0000
-@@ -20,8 +20,6 @@
- [dependencies]
- libz-sys = ">= 0"
+--- a/deps/curl-sys-0.3.6/Cargo.toml
++++ b/deps/curl-sys-0.3.6/Cargo.toml
+@@ -22,4 +22,2 @@
  libc = "0.2"
 -
 -[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
  openssl-sys = "0.9"
- 
- [target."cfg(windows)".dependencies]
-Index: cargo/deps/curl-0.4.1/Cargo.toml
-===================================================================
---- cargo.orig/deps/curl-0.4.1/Cargo.toml	2016-11-11 15:37:52.000000000 +0000
-+++ cargo/deps/curl-0.4.1/Cargo.toml	2016-11-26 00:29:52.800169929 +0000
-@@ -11,9 +11,6 @@
- [dependencies]
- libc = "0.2"
+--- a/deps/curl-0.4.1/Cargo.toml
++++ b/deps/curl-0.4.1/Cargo.toml
+@@ -13,5 +13,2 @@
  curl-sys = { path = "curl-sys", version = "0.3" }
 -
 -# Unix platforms use OpenSSL for now to provide SSL functionality
 -[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
  openssl-sys = "0.9.0"
- openssl-probe = "0.1"
- 
-- 
2.30.2